Remove overrideServerChunkSize config entry

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>

diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
index 5628ae7907233365f6d5b3c1f5c5bd20894a6658..54a08ec2e8f542e29888b18fcea1121b404e70cc 100644 (file)
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -1157,7 +1157,7 @@ SyncOptions Folder::initializeSyncOptions() const
     const auto cfgMinChunkSize = cfgFile.minChunkSize();
     opt.setMinChunkSize(cfgMinChunkSize);
 
-    if (const auto capsMaxChunkSize = account->capabilities().maxChunkSize(); capsMaxChunkSize > 0 && !cfgFile.overrideServerChunkSize()) {
+    if (const auto capsMaxChunkSize = account->capabilities().maxChunkSize(); capsMaxChunkSize) {
         opt.setMaxChunkSize(capsMaxChunkSize);
         opt._initialChunkSize = capsMaxChunkSize;
     } else {

diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp
index 40b918a25681da2cb1209cc30442058513ad9cee..2b1cda432e597094ff865ce9e6b71bff398aa468 100644 (file)
--- a/src/libsync/configfile.cpp
+++ b/src/libsync/configfile.cpp
@@ -70,7 +70,6 @@ static constexpr char overrideLocalDirC[] = "overrideLocalDir";
 static constexpr char isVfsEnabledC[] = "isVfsEnabled";
 static constexpr char geometryC[] = "geometry";
 static constexpr char timeoutC[] = "timeout";
-static constexpr char overrideServerChunkSizeC[] = "overrideServerChunkSize";
 static constexpr char chunkSizeC[] = "chunkSize";
 static constexpr char minChunkSizeC[] = "minChunkSize";
 static constexpr char maxChunkSizeC[] = "maxChunkSize";
@@ -259,12 +258,6 @@ int ConfigFile::timeout() const
     return settings.value(QLatin1String(timeoutC), 300).toInt(); // default to 5 min
 }
 
-bool ConfigFile::overrideServerChunkSize() const
-{
-    QSettings settings(configFile(), QSettings::IniFormat);
-    return settings.value(QLatin1String(overrideServerChunkSizeC), false).toBool();
-}
-
 qint64 ConfigFile::chunkSize() const
 {
     QSettings settings(configFile(), QSettings::IniFormat);

diff --git a/src/libsync/configfile.h b/src/libsync/configfile.h
index 27a83a5c2e15c26fcc8c15e69fb0267a4b8f70ae..844036336a6f9b0c650276a0a7c67bacdd91fbe8 100644 (file)
--- a/src/libsync/configfile.h
+++ b/src/libsync/configfile.h
@@ -177,7 +177,6 @@ public:
     void setShowInExplorerNavigationPane(bool show);
 
     [[nodiscard]] int timeout() const;
-    [[nodiscard]] bool overrideServerChunkSize() const;
     [[nodiscard]] qint64 chunkSize() const;
     [[nodiscard]] qint64 maxChunkSize() const;
     [[nodiscard]] qint64 minChunkSize() const;